Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Edgecore][sonic-platform-modules-accton]Support kernel 6.1 and bookworm #16982

Merged
merged 3 commits into from
Oct 31, 2023

Conversation

jostar-yang
Copy link
Contributor

Why I did it

The sonic-platform-modules-accton package builds were failing to build against the 6.1 kernel in bookworm branch.

Work item tracking
  • Microsoft ADO (number only):

How I did it

Enable rule.mk to let build sonic-platform-modules-accton
Modify accton driver that use "i2c_driver->remove callback function" to use "void" instead of "init".
Because kernel 6.1 has change to be below.

struct i2c_driver {
unsigned int class;

/* Standard driver model interfaces */
int (*probe)(struct i2c_client *client);
void (*remove)(struct i2c_client *client);

Old kernel define as below,
.....
init (*remove)(struct i2c_client *client);

How to verify it

Build deb.
BLDENV=bookworm make -f Makefile.work $@
Check deb can build successfully

Which release branch to backport (provide reason below if selected)

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106
  • 202111
  • 202205
  • 202211
  • 202305

Tested branch (Please provide the tested image version)

Description for the changelog

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

@jostar-yang
Copy link
Contributor Author

This PR is for fix issue,
#16736

@saiarcot895
Copy link
Contributor

Thank you for updating the Accton platform module for Bookworm!

Since it looks like there's a dependency on PDDF, I'll get #16954 merged in first and then have the PR checkers be rerun, and verify that the Broadcom build succeeds.

@saiarcot895
Copy link
Contributor

@jostar-yang Could you resolve the conflicts? I think cherry-picking the pddf commit introduced the conflicts.

@jostar-yang
Copy link
Contributor Author

@jostar-yang Could you resolve the conflicts? I think cherry-picking the pddf commit introduced the conflicts.

OK. Done to fix conflicts.

@saiarcot895
Copy link
Contributor

/azpw run Azure.sonic-buildimage

@saiarcot895
Copy link
Contributor

/azpw run

@saiarcot895
Copy link
Contributor

/azpw run Azure.sonic-buildimage

@yxieca yxieca merged commit a072eff into sonic-net:bookworm Oct 31, 2023
10 checks passed
saiarcot895 pushed a commit to saiarcot895/sonic-buildimage that referenced this pull request Nov 7, 2023
…orm (sonic-net#16982)

* [Edgecore][sonic-platform-modules-accton]Support kernel 6.1 and bookworm

* Modify pddf drv code for i2c_remove_callback function fail
saiarcot895 pushed a commit to saiarcot895/sonic-buildimage that referenced this pull request Nov 21, 2023
…orm (sonic-net#16982)

* [Edgecore][sonic-platform-modules-accton]Support kernel 6.1 and bookworm

* Modify pddf drv code for i2c_remove_callback function fail
yxieca pushed a commit that referenced this pull request Nov 22, 2023
…orm (#16982)

* [Edgecore][sonic-platform-modules-accton]Support kernel 6.1 and bookworm

* Modify pddf drv code for i2c_remove_callback function fail
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants